gitweb / test / file with spaceson commit mergetool: Make git-rm quiet when resolving a deleted file conflict (1346c99)
   1This
   2filename
   3contains
   4spaces.